@ampless/runtime 0.2.0-alpha.9 → 1.0.0-alpha.14

package/README.ja.md

@@ -34,10 +34,10 @@ export const ampless = createAmpless({
 })
 ```
 
-`app/site/[siteId]/` 以下のルートとディスパッチャーはワンライナーのファクトリー呼び出しになります：
+`app/` 直下のルートとディスパッチャーはワンライナーのファクトリー呼び出しになります：
 
 ```ts
-// app/site/[siteId]/page.tsx
+// app/page.tsx
 import { ampless } from '@/lib/ampless'
 import {
   createThemeHomeDispatcher,
@@ -50,7 +50,7 @@ export default createThemeHomeDispatcher(ampless)
 ```
 
 ```ts
-// app/site/[siteId]/og/[slug]/route.ts
+// app/og/[slug]/route.ts
 import { ampless } from '@/lib/ampless'
 import { createOgRouteHandler } from '@ampless/runtime/routes'
 
@@ -59,22 +59,48 @@ export const dynamic = 'force-dynamic'
 export const GET = createOgRouteHandler(ampless)
 ```
 
-ミドルウェア：
+ミドルウェア（proxy）：
 
 ```ts
-// middleware.ts
+// proxy.ts （Next.js 16 で middleware.ts から改名）
 import cmsConfig from './cms.config'
-import { createAmplessMiddleware, defaultMatcherConfig } from '@ampless/runtime/middleware'
+import outputs from './amplify_outputs.json'
+import { createAmplessMiddleware } from '@ampless/runtime/middleware'
 
-export const middleware = createAmplessMiddleware({ cmsConfig })
-export const config = defaultMatcherConfig
+export const proxy = createAmplessMiddleware({
+  cmsConfig,
+  appsyncUrl: outputs.data.url,
+  apiKey: outputs.data.api_key!,
+})
+
+// matcher はインライン定義 — Next.js 16 の Turbopack は `export const config`
+// が静的オブジェクトリテラルであることを要求します。
+export const config = {
+  matcher: [
+    '/((?!admin|api|login|_next/static|_next/image|favicon\\.ico|amplify_outputs\\.json).*)',
+  ],
+}
 ```
 
+middleware はリクエストごとに AppSync から `post.format` /
+`post.metadata` / `post.updatedAt` を取得（apiKey 認証）し、slug をキー
+にした 200 エントリの LRU（60 秒 TTL、Lambda モジュールスコープ）で
+キャッシュした上で、適切な内部ハンドラーにリクエストを書き換えます。
+
+- 通常の投稿 → 書き換えなし、`app/[slug]/page.tsx` で配信
+- `metadata.no_layout: true` HTML / `format: 'static'` → `/r/<slug>(/<path>)`、
+  `app/r/[slug]/[[...path]]/route.ts` で配信
+
+また、`post.metadata.cache`（auto / deep / hot）+ `post.updatedAt` +
+`cms.config.cache.{cooldownMs, freshTtlSeconds, deepTtlSeconds}` から
+`Cache-Control` を算出してレスポンスに付与します。キャッシュ戦略の
+契約については `docs/CONTENT.md` を参照してください。
+
 ## サブパス
 
 - `@ampless/runtime` — `createAmpless`、ランタイム型、`renderBody`・`renderThemeCss`・フォーマットコンバーターの再エクスポート
 - `@ampless/runtime/middleware` — `createAmplessMiddleware`、`defaultMatcherConfig`
-- `@ampless/runtime/routes` — `createOgRouteHandler`、`createSitemapRouteHandler`、`createFeedRouteHandler`、`createRawRouteHandler`
+- `@ampless/runtime/routes` — `createOgRouteHandler`、`createSitemapRouteHandler`、`createFeedRouteHandler`、`createUnderscoreRouteHandler`
 - `@ampless/runtime/dispatchers` — `createThemeHomeDispatcher`、`createThemePostDispatcher`、`createThemeTagDispatcher`（それぞれ対応する `*Metadata` ファクトリーあり）
 
 ## テンプレートに残るもの

package/README.md

@@ -34,10 +34,10 @@ export const ampless = createAmpless({
 })
 ```
 
-Routes and dispatchers under `app/site/[siteId]/` become one-line factory invocations:
+Routes and dispatchers under `app/` become one-line factory invocations:
 
 ```ts
-// app/site/[siteId]/page.tsx
+// app/page.tsx
 import { ampless } from '@/lib/ampless'
 import {
   createThemeHomeDispatcher,
@@ -50,7 +50,7 @@ export default createThemeHomeDispatcher(ampless)
 ```
 
 ```ts
-// app/site/[siteId]/og/[slug]/route.ts
+// app/og/[slug]/route.ts
 import { ampless } from '@/lib/ampless'
 import { createOgRouteHandler } from '@ampless/runtime/routes'
 
@@ -59,22 +59,48 @@ export const dynamic = 'force-dynamic'
 export const GET = createOgRouteHandler(ampless)
 ```
 
-Middleware:
+Middleware (proxy):
 
 ```ts
-// middleware.ts
+// proxy.ts (Next.js 16 rename of middleware.ts)
 import cmsConfig from './cms.config'
-import { createAmplessMiddleware, defaultMatcherConfig } from '@ampless/runtime/middleware'
+import outputs from './amplify_outputs.json'
+import { createAmplessMiddleware } from '@ampless/runtime/middleware'
 
-export const middleware = createAmplessMiddleware({ cmsConfig })
-export const config = defaultMatcherConfig
+export const proxy = createAmplessMiddleware({
+  cmsConfig,
+  appsyncUrl: outputs.data.url,
+  apiKey: outputs.data.api_key!,
+})
+
+// Inline the matcher — Next.js 16's Turbopack requires
+// `export const config` to be a static object literal.
+export const config = {
+  matcher: [
+    '/((?!admin|api|login|_next/static|_next/image|favicon\\.ico|amplify_outputs\\.json).*)',
+  ],
+}
 ```
 
+The middleware fetches `post.format` / `post.metadata` / `post.updatedAt`
+from AppSync (apiKey auth) on each request, caches the result in a
+200-entry LRU keyed by slug (60-second TTL, Lambda module scope), and
+rewrites the request to the right internal handler:
+
+- themed post → no rewrite, served by `app/[slug]/page.tsx`
+- `metadata.no_layout: true` HTML / `format: 'static'` → `/r/<slug>(/<path>)`,
+  served by `app/r/[slug]/[[...path]]/route.ts`
+
+It also computes `Cache-Control` from `post.metadata.cache` (auto /
+deep / hot) + `post.updatedAt` + `cms.config.cache.{cooldownMs,
+freshTtlSeconds, deepTtlSeconds}` and sets the header on the response.
+See `docs/CONTENT.md` for the cache strategy contract.
+
 ## Sub-paths
 
 - `@ampless/runtime` — `createAmpless`, runtime types, and re-exports of `renderBody`, `renderThemeCss`, format converters
 - `@ampless/runtime/middleware` — `createAmplessMiddleware`, `defaultMatcherConfig`
-- `@ampless/runtime/routes` — `createOgRouteHandler`, `createSitemapRouteHandler`, `createFeedRouteHandler`, `createRawRouteHandler`
+- `@ampless/runtime/routes` — `createOgRouteHandler`, `createSitemapRouteHandler`, `createFeedRouteHandler`, `createUnderscoreRouteHandler`
 - `@ampless/runtime/dispatchers` — `createThemeHomeDispatcher`, `createThemePostDispatcher`, `createThemeTagDispatcher` (each with a matching `*Metadata` factory)
 
 ## What's still in the template

package/dist/dispatchers/index.d.ts

@@ -4,16 +4,14 @@ import { Ampless } from '../index.js';
 import 'ampless';
 
 interface Props$2 {
-    params: Promise<{
-        siteId: string;
-    }>;
+    params: Promise<Record<string, never>>;
 }
 type ThemeHomeDispatcher = (props: Props$2) => Promise<ReactNode>;
 type ThemeHomeMetadata = (props: Props$2) => Promise<Metadata>;
 /**
- * Home page dispatcher. Resolves the active theme for the request's
- * siteId and renders the theme's `components.Home` server component
- * with the same `params` Promise it was passed.
+ * Home page dispatcher. Resolves the active theme and renders the
+ * theme's `components.Home` server component with the same `params`
+ * Promise it was passed.
  */
 declare function createThemeHomeDispatcher(ampless: Ampless): ThemeHomeDispatcher;
 /** generateMetadata factory for the home dispatcher. */
@@ -21,29 +19,23 @@ declare function createThemeHomeMetadata(ampless: Ampless): ThemeHomeMetadata;
 
 interface Props$1 {
     params: Promise<{
-        siteId: string;
         slug: string;
     }>;
 }
 type ThemePostDispatcher = (props: Props$1) => Promise<ReactNode>;
 type ThemePostMetadata = (props: Props$1) => Promise<Metadata>;
 /**
- * Post page dispatcher. Resolves the active theme and renders the
- * theme's `components.Post` server component.
- *
- * Before delegating, the dispatcher peeks at the post's metadata: if
- * `metadata.no_layout === true`, the post is meant to be served as
- * bare HTML (own DOCTYPE, no theme chrome, no Next.js root layout).
- * Next.js page.tsx can't bypass the root layout, so we 308-redirect
- * to the raw route handler at `/raw/<slug>` which returns the body
- * unchanged. The redirect is permanent because no_layout is a
- * persistent property of the post — bookmarks naturally settle on
- * the `/raw/` URL.
+ * Themed post page dispatcher. Resolves the active theme and renders
+ * the theme's `components.Post` server component.
  *
- * The metadata peek is an extra AppSync call before theme resolve,
- * but it's the same query the theme's Post component would make
- * anyway; AppSync's query-level dedupe within a single request keeps
- * the wire cost flat in practice.
+ * Routing decision (no_layout HTML vs static bundle vs themed) lives
+ * in middleware now — middleware fetches `post.format` /
+ * `post.metadata` / `post.updatedAt` from AppSync once per slug
+ * (Lambda-memory LRU, 60s TTL) and rewrites the request to either
+ * this dispatcher (themed render) or the unified route handler at
+ * `/r/<slug>(/...)` (no_layout HTML or static bundle). That keeps the
+ * decision in one place and avoids the dispatcher's extra AppSync
+ * round-trip when the post is a themed render.
  *
  * If the theme doesn't declare a Post component at all, returns
  * Next.js's notFound() (404).
@@ -54,7 +46,6 @@ declare function createThemePostMetadata(ampless: Ampless): ThemePostMetadata;
 
 interface Props {
     params: Promise<{
-        siteId: string;
         tag: string;
     }>;
 }

package/dist/dispatchers/index.js

@@ -1,36 +1,24 @@
 // src/dispatchers/home.ts
 function createThemeHomeDispatcher(ampless) {
   return async function SiteHomeDispatcher({ params }) {
-    const { siteId } = await params;
-    const { module } = await ampless.resolveActiveTheme(siteId);
+    const { module } = await ampless.resolveActiveTheme();
     const Home = module.components.Home;
     return await Home({ params });
   };
 }
 function createThemeHomeMetadata(ampless) {
   return async function generateMetadata({ params }) {
-    const { siteId } = await params;
-    const { module } = await ampless.resolveActiveTheme(siteId);
+    const { module } = await ampless.resolveActiveTheme();
     const fn = module.metadata?.Home;
     return fn ? await fn({ params }) : {};
   };
 }
 
 // src/dispatchers/post.ts
-import { notFound, redirect } from "next/navigation";
+import { notFound } from "next/navigation";
 function createThemePostDispatcher(ampless) {
   return async function SitePostDispatcher({ params }) {
-    const { siteId, slug } = await params;
-    const post = await ampless.getPublishedPost(slug, { siteId });
-    if (post?.metadata?.no_layout === true) {
-      redirect(`/raw/${slug}`);
-    }
-    if (post?.format === "static") {
-      const body = post.body ?? null;
-      const entrypoint = typeof body?.entrypoint === "string" && body.entrypoint ? body.entrypoint : "index.html";
-      redirect(`/${slug}/${entrypoint}`);
-    }
-    const { module } = await ampless.resolveActiveTheme(siteId);
+    const { module } = await ampless.resolveActiveTheme();
     const Post = module.components.Post;
     if (!Post) notFound();
     return await Post({ params });
@@ -38,8 +26,7 @@ function createThemePostDispatcher(ampless) {
 }
 function createThemePostMetadata(ampless) {
   return async function generateMetadata({ params }) {
-    const { siteId } = await params;
-    const { module } = await ampless.resolveActiveTheme(siteId);
+    const { module } = await ampless.resolveActiveTheme();
     const fn = module.metadata?.Post;
     return fn ? await fn({ params }) : {};
   };
@@ -49,8 +36,7 @@ function createThemePostMetadata(ampless) {
 import { notFound as notFound2 } from "next/navigation";
 function createThemeTagDispatcher(ampless) {
   return async function SiteTagDispatcher({ params }) {
-    const { siteId } = await params;
-    const { module } = await ampless.resolveActiveTheme(siteId);
+    const { module } = await ampless.resolveActiveTheme();
     const Tag = module.components.Tag;
     if (!Tag) notFound2();
     return await Tag({ params });
@@ -58,8 +44,7 @@ function createThemeTagDispatcher(ampless) {
 }
 function createThemeTagMetadata(ampless) {
   return async function generateMetadata({ params }) {
-    const { siteId } = await params;
-    const { module } = await ampless.resolveActiveTheme(siteId);
+    const { module } = await ampless.resolveActiveTheme();
     const fn = module.metadata?.Tag;
     return fn ? await fn({ params }) : {};
   };

package/dist/index.d.ts

@@ -25,7 +25,6 @@ interface StorageApi {
 
 interface PublicPostShape {
     postId: string;
-    siteId: string;
     slug: string;
     title: string;
     excerpt?: string | null;
@@ -35,13 +34,18 @@ interface PublicPostShape {
     publishedAt?: string | null;
     tags?: Array<string | null> | null;
     metadata?: unknown;
+    /**
+     * ISO 8601 timestamp from DynamoDB's auto-managed `updatedAt`.
+     * Surfaced through the `PublicPost` projection in v0.2 alpha so
+     * middleware can compute the `metadata.cache='auto'` cooldown.
+     */
+    updatedAt?: string | null;
 }
 interface PublicPostConnectionShape {
     items?: Array<PublicPostShape | null> | null;
     nextToken?: string | null;
 }
 interface ListPostsOptions {
-    siteId?: string;
     /** ISO 8601 timestamp; SK lower bound (inclusive). */
     from?: string;
     /** ISO 8601 timestamp; SK upper bound (inclusive). */
@@ -51,7 +55,6 @@ interface ListPostsOptions {
     nextToken?: string;
 }
 interface ListPostsByTagOptions {
-    siteId?: string;
     limit?: number;
     nextToken?: string;
 }
@@ -61,9 +64,7 @@ interface ListPostsResult {
 }
 interface PostsApi {
     listPublishedPosts(opts?: ListPostsOptions): Promise<ListPostsResult>;
-    getPublishedPost(slug: string, opts?: {
-        siteId?: string;
-    }): Promise<Post | null>;
+    getPublishedPost(slug: string): Promise<Post | null>;
     listPostsByTag(tag: string, opts?: ListPostsByTagOptions): Promise<ListPostsResult>;
 }
 
@@ -87,18 +88,18 @@ interface EffectiveSiteSettings {
     timezone?: string;
 }
 interface SiteSettingsApi {
-    loadSiteSettings(siteId?: string): Promise<EffectiveSiteSettings>;
+    loadSiteSettings(): Promise<EffectiveSiteSettings>;
 }
 
 interface SeoApi {
-    postMetadata(post: Post, siteId?: string): Promise<Metadata>;
-    siteMetadata(siteId?: string): Promise<Metadata>;
+    postMetadata(post: Post): Promise<Metadata>;
+    siteMetadata(): Promise<Metadata>;
 }
 
 interface ThemesRegistry {
     /** Map of theme name → loaded theme module. */
     themes: Record<string, ThemeModule>;
-    /** Name used when no `theme.active` override is stored for the site. */
+    /** Name used when no `theme.active` override is stored. */
     defaultTheme: string;
 }
 interface ResolvedTheme {
@@ -106,7 +107,7 @@ interface ResolvedTheme {
     module: ThemeModule;
 }
 interface ThemeActiveApi {
-    resolveActiveTheme(siteId?: string): Promise<ResolvedTheme>;
+    resolveActiveTheme(): Promise<ResolvedTheme>;
 }
 
 type ColorScheme = 'auto' | 'light' | 'dark';
@@ -145,7 +146,7 @@ interface EffectiveThemeConfig {
     colorScheme: ColorScheme;
 }
 interface ThemeConfigApi {
-    loadThemeConfig(siteId?: string): Promise<EffectiveThemeConfig>;
+    loadThemeConfig(): Promise<EffectiveThemeConfig>;
 }
 /**
  * Render `cssVars` as the body of a `:root { ... }` CSS block. Values
@@ -159,32 +160,42 @@ declare function renderBody(post: Post): string;
  * Convert a tiptap doc to its HTML form. Same renderer the public
  * site uses. Defensive: tiptap accepts an HTML string as initial
  * content and parses it on mount, but won't fire onUpdate until the
- * user edits — so a format-switch chain (e.g. markdown → tiptap →
+ * user edits, so a format-switch chain (e.g. markdown -> tiptap ->
  * markdown without editing) can still hand us a raw HTML string
  * here. In that case, return it as-is rather than walking it as a
  * malformed tiptap node and producing empty output.
  */
 declare function tiptapToHtml(doc: unknown): string;
-/** Convert markdown to HTML using the built-in minimal renderer. */
+/** Convert markdown to HTML using marked + GFM. */
 declare function markdownToHtml(md: string): string;
 /**
  * Walk a tiptap doc and emit Markdown. Mirrors `renderTiptap` in
  * shape but produces markdown syntax. Loses anything markdown can't
  * express (data attributes, image display modes, custom marks).
  *
+ * Notes on info loss:
+ * - underline / highlight are not in GFM, so they fall back to the
+ *   literal `<u>` / `<mark>` HTML tags (preserved as-is across round trips).
+ * - paragraph / heading textAlign cannot be expressed in markdown and
+ *   is therefore lost on conversion.
+ *
  * Same defensive path as tiptapToHtml: a string input means tiptap
  * hasn't emitted JSON yet (the body is still the HTML we handed it).
  * Route through htmlToMarkdown so the content survives.
  */
 declare function tiptapToMarkdown(doc: unknown): string;
 /**
- * Regex-based HTML → Markdown converter. Handles the tag set the
+ * Regex-based HTML -> Markdown converter. Handles the tag set the
  * editor produces (`<p>` `<h1>`-`<h6>` `<strong>` `<em>` `<a>`
  * `<img>` `<ul>` `<ol>` `<li>` `<code>` `<pre>` `<blockquote>` `<hr>`
- * `<br>`). Anything else (tables, sections, divs) keeps its content
- * but loses structural meaning.
+ * `<br>` `<u>` `<mark>` `<table>` task-list `<ul data-type="taskList">`).
+ * Decorative containers like `<div style="text-align:...">` are dropped.
+ *
+ * Tables are reduced to GFM pipe syntax via convertHtmlTable. Complex
+ * nested content inside cells (lists, other tables) is flattened to
+ * plain text.
  *
- * Not a full library — there are known limits like nested formatting
+ * Not a full library, there are known limits like nested formatting
  * inside list items potentially merging. Acceptable for a v0.x
  * format-switch convenience; complex HTML round-trips shouldn't be
  * relied on.
@@ -198,15 +209,13 @@ interface CreateAmplessOpts {
 }
 interface Ampless {
     listPublishedPosts(opts?: ListPostsOptions): Promise<ListPostsResult>;
-    getPublishedPost(slug: string, opts?: {
-        siteId?: string;
-    }): Promise<Post | null>;
+    getPublishedPost(slug: string): Promise<Post | null>;
     listPostsByTag(tag: string, opts?: ListPostsByTagOptions): Promise<ListPostsResult>;
-    loadSiteSettings(siteId?: string): Promise<EffectiveSiteSettings>;
-    resolveActiveTheme(siteId?: string): Promise<ResolvedTheme>;
-    loadThemeConfig(siteId?: string): Promise<EffectiveThemeConfig>;
-    postMetadata(post: Post, siteId?: string): Promise<Metadata>;
-    siteMetadata(siteId?: string): Promise<Metadata>;
+    loadSiteSettings(): Promise<EffectiveSiteSettings>;
+    resolveActiveTheme(): Promise<ResolvedTheme>;
+    loadThemeConfig(): Promise<EffectiveThemeConfig>;
+    postMetadata(post: Post): Promise<Metadata>;
+    siteMetadata(): Promise<Metadata>;
     renderBody(post: Post): string;
     renderThemeCss(cssVars: Record<string, string>): string;
     publicAssetUrl(key: string): string;